Code cleanup, removing console logs and commented code,