Cleanup and new methods