diff --git a/bin/pelican b/bin/pelican
deleted file mode 100755
index 3fe2ee57..00000000
--- a/bin/pelican
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/usr/bin/env python
-from pelican import main
-main()
diff --git a/bin/pelican.bat b/bin/pelican.bat
deleted file mode 100755
index 674e1fd7..00000000
--- a/bin/pelican.bat
+++ /dev/null
@@ -1 +0,0 @@
-@python "%~dpn0" %*
diff --git a/pelican/__init__.py b/pelican/__init__.py
index 710c9ff1..a0b5704c 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -158,7 +158,3 @@ def main():
             raise
         else:
             sys.exit(getattr(e, 'exitcode', 1))
-
-
-if __name__ == '__main__':
-    main()
diff --git a/tools/pelican_import.py b/tools/pelican_import.py
index 261bff4c..e7f8e051 100755
--- a/tools/pelican_import.py
+++ b/tools/pelican_import.py
@@ -269,6 +269,7 @@ def main():
             error("Couldn't create the output folder: " + args.output)
             exit()
 
+    # TODO: refactor this long assignment
     input_type, input, out_markup, output_path, dircat=False = input_type, args.input, args.markup, args.output, args.dircat
 
     if input_type == 'wordpress':
diff --git a/tools/pelican_quickstart.py b/tools/pelican_quickstart.py
index 4048c2bf..56c22f10 100755
--- a/tools/pelican_quickstart.py
+++ b/tools/pelican_quickstart.py
@@ -270,6 +270,3 @@ Please answer the following questions so this script can generate the files need
             print('Error: {0}'.format(e))
 
     print('Done. Your new project is available at %s' % CONF['basedir'])
-
-if __name__ == '__main__':
-    main()
diff --git a/tools/pelican_themes.py b/tools/pelican_themes.py
index 78df4a48..3d35bb5d 100755
--- a/tools/pelican_themes.py
+++ b/tools/pelican_themes.py
@@ -212,6 +212,3 @@ def clean(v=False):
                     c+=1
 
     print("\nRemoved {0} broken links".format(c))
-
-if __name__ == '__main__':
-    main()