Cleaned up for deployment check