Removed all creditcard stuff(big refactor, woah)
Started refactor on creditcard