Removed double (merged) code