Removed some code left over from a client's project that caused some issues.

More...