Clean up of bullet code