Cleared stupid stuff, added good stuff