Remove mv hack into decent code