Removing part of the code that I wish I never did