Cleanup, saved some space