Removed unncessary if construct