More work on the mould maker, removed AEs api, some cleanup