Add clear method on image/location/size/machine controllers and further clean up machines controller