Remove unused entries
Update some core code