Remove old files and minor cleanup