Cleaned up paths, and removed dead code