Removing some excess code.