Removed SHOW_CURSOR, cleanup