Remove unused keywords and allow frame instances to be used