Cleanup of annoyances