Clean up

Cleaned up unused variables and fixed intial path statement.