Removed some old test code, hack