Fixed #282 and removed unused files