remove more code that can be brought back later if needed