remove uneeded files and tidying code