Removed unneeded code and properties