removed unnecessary methods
merged