Clean up further