Removed some functionality that needed to move.