Impoved performance, removed old files