Clean up un-used code