Code Cleanup, removed commented Lines of code