Removed potential problem code to fix AWS?