Cleanup on prev fix