Cleanup code base!

Need a cleanup asap!