cleaning up amier's mess