Removed unnesesary code