Code cleanup, fix helmet removal