Add ST2 compatability
Remove useless files that somehow slipped through