Fixed Build Warnings + Removed Commented out code