Cleaned up the code a bit and removed the support for alternative path.