Remove left-over file
Port most of the logic to the new API
Update gitignore