Cleaned up deprecated scaffold