Major overhaul!
Remove deprecated file