Removed unneeded prefixes and updated copyright year