Stripped some useless code