Remove chunks of code made irrelevent by removing explicit module choice