support: Clean up code