Cleaned up stuff I never needed anyway; let's build from scratch