Cleaned out some project-specific crap, added push classes