Cleaned up some crap