AJ: remove extraenous pre-packaging