Cleanup alot of code.