Cleaned up some code for readability.
Removed clean method as functionality now in 'remove' method.
Re-added scope deletion to avoid unnecessary reference caching.