Add support for "instance-parameter", do not blindly add "self" parameter
Remove unused code