Removed old custom code