Cleaning up old un-used code.