changed redirections and deleted unused method