Removed Excecutor usage