Routes polish and removing redundant files