Removed dead code and non-relavant test