Code cleanup, removed unnecessary files