Some additions and limitations
Remove unused file