aInitial compile cleanup