Don't worry about it now but lets remove commented out codes