Unnecessary files and routines removed