Removing some trash code