cleanup
fix spam