Spring Cleaning - Removed unused functions and addressed few variables that compiled complained about..