Merge fix
Remove push support
Cleanup options and untyped things