Dropped some usless code