cleaning and making release architecture