cleaning out module gen from dev
merge problem, hope this fixes