Cleaned up old stuff. Master stays as it is for now, but develop is getting it's ass kicked for some time now.