Hack and slash for a clean compile