Removed all spark stuff