Refactor, remove TopContext
Remove file