Removed useless code, and stripped custom prefix