cleaned up left over code