Removed some code that is no longer needed after master merge.