Removed troublesome modules