Moved properties out of the header and into the .m files and removed superfluous properties.