Fixed invalid method signatures
Commented out useless code to reduce number of compiler warnings