Removed un-necessary paramaters