Cleanup spec and update sources