Code cleanup and remove unused compose code