Cleaning up, removed some unused stuff