Remove some unworking deinitions