Remove modules and do some schema cleanup