Build cleaned up