cleaned up code to remove test things