Cleaned up surplus crap