Removed function and cleanup