Removed uneccessary files, added timeouts