Unnecessary functionality removed