Removed Old Controls