Removed unneeded code, cleaned up a bit.