removed duplicate / unnecessary functions