Small fix and some file removal