Cleanup. Simplified methods