cleaned up further and removed unnecessary files