Removed unneeded code

Small improvements