Remove depricated script, bugfixes