Cleans up unused code and removes comments *yikes*