removes control transition and swaps out some includes for extends