Cleaned up useless stuff
removed useless stuff