My Old code cleanup

Clean out useless functions and some comelier warnings.