Removed unnecessary files, fixed build