Removed Custom Code, Switched back to Express