Clearing some excess code