removed even more redundant code