Cleaning up old code, out of scope in first release