Removed some work done for another ticket.