lets try slimming this down

Lets hope I Judged this correctly...committing then compiling, will revert obviously if i caused any major damages but im doubtful. This is part one of a much bigger cleanup...