Remove module definition until fully tested