Even More Cleaning

soooooo much code to clean :(