General repository maintenance

Fix broken API, remove unneeded stuff, etc.