Fixed paths and removed unused code.