Got rid of unneeeded code