Debugging comments removed