cleaned up garbage code that I avoided using