Remove strange-looking methods. Cleanup.