Remove some unused files Also Closes #31