Removed some old ugly code