remove old files and cleanup imports