Removing stub code and adding some empty methods