Cleaned + removed unnecessary objects