Revert "Updated to new basecode"

This reverts commit 1bca1a1909c59c7c88f2f593c6da8271f26e02cf.
Revert "Removed unneeded code"

This reverts commit 6b7c30a00695c6b71a94926b6340765df47d1973.