diff --git a/heat/__init__.py b/heat/__init__.py
index 0c7fc6ddc..4bbe1336f 100644
--- a/heat/__init__.py
+++ b/heat/__init__.py
@@ -1,7 +1,5 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
-# Copyright 2010-2011 OpenStack LLC.
-# All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
 #    not use this file except in compliance with the License. You may obtain
diff --git a/heat/api/__init__.py b/heat/api/__init__.py
index d65c689a8..e8e403594 100644
--- a/heat/api/__init__.py
+++ b/heat/api/__init__.py
@@ -1,7 +1,5 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
-# Copyright 2011 OpenStack LLC.
-# All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
 #    not use this file except in compliance with the License. You may obtain
diff --git a/heat/api/middleware/__init__.py b/heat/api/middleware/__init__.py
index d65c689a8..e8e403594 100644
--- a/heat/api/middleware/__init__.py
+++ b/heat/api/middleware/__init__.py
@@ -1,7 +1,5 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
-# Copyright 2011 OpenStack LLC.
-# All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
 #    not use this file except in compliance with the License. You may obtain
diff --git a/heat/api/middleware/context.py b/heat/api/middleware/context.py
index 6f480aa5c..c8c4d1886 100644
--- a/heat/api/middleware/context.py
+++ b/heat/api/middleware/context.py
@@ -1,7 +1,5 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
-# Copyright 2011 OpenStack LLC.
-# All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
 #    not use this file except in compliance with the License. You may obtain
diff --git a/heat/api/middleware/version_negotiation.py b/heat/api/middleware/version_negotiation.py
index 2d525d037..181d2788c 100644
--- a/heat/api/middleware/version_negotiation.py
+++ b/heat/api/middleware/version_negotiation.py
@@ -1,7 +1,5 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
-# Copyright 2011 OpenStack LLC.
-# All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
 #    not use this file except in compliance with the License. You may obtain
diff --git a/heat/api/v1/__init__.py b/heat/api/v1/__init__.py
index a7c2da058..d39dd5ae1 100644
--- a/heat/api/v1/__init__.py
+++ b/heat/api/v1/__init__.py
@@ -1,7 +1,5 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
-# Copyright 2011 OpenStack LLC.
-# All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
 #    not use this file except in compliance with the License. You may obtain
diff --git a/heat/api/v1/router.py b/heat/api/v1/router.py
index 5c9ce31e9..95432860c 100644
--- a/heat/api/v1/router.py
+++ b/heat/api/v1/router.py
@@ -1,7 +1,5 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
-# Copyright 2011 OpenStack LLC.
-# All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
 #    not use this file except in compliance with the License. You may obtain
diff --git a/heat/api/v1/stacks.py b/heat/api/v1/stacks.py
index f81874c71..5145e718b 100644
--- a/heat/api/v1/stacks.py
+++ b/heat/api/v1/stacks.py
@@ -1,7 +1,5 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
-# Copyright 2010 OpenStack LLC.
-# All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
 #    not use this file except in compliance with the License. You may obtain
diff --git a/heat/api/versions.py b/heat/api/versions.py
index 07d112e5f..b0498c9fd 100644
--- a/heat/api/versions.py
+++ b/heat/api/versions.py
@@ -1,7 +1,5 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
-# Copyright 2011 OpenStack LLC.
-# All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
 #    not use this file except in compliance with the License. You may obtain
diff --git a/heat/client.py b/heat/client.py
index d0bc06471..837ccfbd0 100644
--- a/heat/client.py
+++ b/heat/client.py
@@ -1,7 +1,5 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
-# Copyright 2010-2011 OpenStack, LLC
-# All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
 #    not use this file except in compliance with the License. You may obtain
diff --git a/heat/common/__init__.py b/heat/common/__init__.py
index b60695702..e8e403594 100644
--- a/heat/common/__init__.py
+++ b/heat/common/__init__.py
@@ -1,7 +1,5 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
-# Copyright 2010-2011 OpenStack LLC.
-# All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
 #    not use this file except in compliance with the License. You may obtain
diff --git a/heat/common/auth.py b/heat/common/auth.py
index 7484fc650..1462e0c6d 100644
--- a/heat/common/auth.py
+++ b/heat/common/auth.py
@@ -1,7 +1,5 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
-# Copyright 2011 OpenStack LLC.
-# All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
 #    not use this file except in compliance with the License. You may obtain
diff --git a/heat/common/client.py b/heat/common/client.py
index 5a63f3e28..1e1a12483 100644
--- a/heat/common/client.py
+++ b/heat/common/client.py
@@ -1,7 +1,5 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
-# Copyright 2010-2011 OpenStack, LLC
-# All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
 #    not use this file except in compliance with the License. You may obtain
diff --git a/heat/common/config.py b/heat/common/config.py
index d17dd7559..ae84325f8 100644
--- a/heat/common/config.py
+++ b/heat/common/config.py
@@ -1,8 +1,6 @@
 #!/usr/bin/env python
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
-# Copyright 2011 OpenStack LLC.
-# All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
 #    not use this file except in compliance with the License. You may obtain
diff --git a/heat/common/context.py b/heat/common/context.py
index 8960ffc50..6cf800541 100644
--- a/heat/common/context.py
+++ b/heat/common/context.py
@@ -1,7 +1,5 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
-# Copyright 2011 OpenStack LLC.
-# All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
 #    not use this file except in compliance with the License. You may obtain
diff --git a/heat/common/crypt.py b/heat/common/crypt.py
index cddd13b5b..d34f49f9b 100644
--- a/heat/common/crypt.py
+++ b/heat/common/crypt.py
@@ -1,8 +1,6 @@
 #!/usr/bin/env python
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
-# Copyright 2011 OpenStack LLC.
-# All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
 #    not use this file except in compliance with the License. You may obtain
diff --git a/heat/common/exception.py b/heat/common/exception.py
index 2a3a8ade1..0c8a45b47 100644
--- a/heat/common/exception.py
+++ b/heat/common/exception.py
@@ -2,7 +2,6 @@
 
 # Copyright 2010 United States Government as represented by the
 # Administrator of the National Aeronautics and Space Administration.
-# All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
 #    not use this file except in compliance with the License. You may obtain
diff --git a/heat/common/policy.py b/heat/common/policy.py
index 1579409ec..a9dd6aff0 100644
--- a/heat/common/policy.py
+++ b/heat/common/policy.py
@@ -1,7 +1,5 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
-# Copyright (c) 2011 OpenStack, LLC.
-# All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
 #    not use this file except in compliance with the License. You may obtain
diff --git a/heat/common/wsgi.py b/heat/common/wsgi.py
index abe07c6ae..cb9fa9c68 100644
--- a/heat/common/wsgi.py
+++ b/heat/common/wsgi.py
@@ -2,7 +2,6 @@
 
 # Copyright 2010 United States Government as represented by the
 # Administrator of the National Aeronautics and Space Administration.
-# Copyright 2010 OpenStack LLC.
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/heat/version.py b/heat/version.py
index e87460bdd..e94d04505 100644
--- a/heat/version.py
+++ b/heat/version.py
@@ -1,6 +1,5 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
-#    Copyright 2011 OpenStack LLC
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
 #    not use this file except in compliance with the License. You may obtain
diff --git a/setup.py b/setup.py
index 5433d4ea3..3830287fe 100755
--- a/setup.py
+++ b/setup.py
@@ -1,5 +1,4 @@
 #!/usr/bin/python
-# Copyright (c) 2010 OpenStack, LLC.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.