diff --git a/heat/cmd/all.py b/heat/cmd/all.py
index 423ef853ba..9521af06ee 100644
--- a/heat/cmd/all.py
+++ b/heat/cmd/all.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 #
 #    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/cmd/api.py b/heat/cmd/api.py
index e074094a87..5a03682fb2 100644
--- a/heat/cmd/api.py
+++ b/heat/cmd/api.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 #
 #    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/cmd/api_cfn.py b/heat/cmd/api_cfn.py
index cc258656d6..b74e304a9f 100644
--- a/heat/cmd/api_cfn.py
+++ b/heat/cmd/api_cfn.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 #
 #    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/cmd/engine.py b/heat/cmd/engine.py
index 81860fcf9b..d5af64b569 100644
--- a/heat/cmd/engine.py
+++ b/heat/cmd/engine.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 #
 #    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/httpd/heat_api.py b/heat/httpd/heat_api.py
index 1b0395d6d9..64f7e2c736 100644
--- a/heat/httpd/heat_api.py
+++ b/heat/httpd/heat_api.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 #
 #    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/httpd/heat_api_cfn.py b/heat/httpd/heat_api_cfn.py
index e86a92ef42..5e8cfcec3b 100644
--- a/heat/httpd/heat_api_cfn.py
+++ b/heat/httpd/heat_api_cfn.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 #
 #    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/tests/convergence/test_converge.py b/heat/tests/convergence/test_converge.py
index 56fac4588d..081a8d43c2 100644
--- a/heat/tests/convergence/test_converge.py
+++ b/heat/tests/convergence/test_converge.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 #
 #    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_integrationtests/.gitignore b/heat_integrationtests/.gitignore
deleted file mode 100644
index 7c549453c1..0000000000
--- a/heat_integrationtests/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-heat_integrationtests.conf
\ No newline at end of file