Removed conflicting stuff