Fix for production envirment, removed uselss function calls in main