Removed spider autostart, refactored some code