removed unnused code