removed unndeeded code