Fixed timeouts, removed some redundant methods and code