Remove modules discussed in #2