Remove code from main