Remove a repeated method
Fix parser args
Remove some SoundCloud refs