Development

Update the master branch to exclude unused variables and methods.